Committing latest code

I had some code on my external I didn't commit, it's been committed now,
good luck Martin :P