Change of roles

Nor do you want your code described as shit. I think we could improve it this way. Or let's look at this other approach it might fit better. Of course we don't have a deadline so you can try both and see the relative advantages and disadvantages.