LOL. I've rebased your changes. I can push this up if you want and you can add the other bits later. What do you think?