naughty commit, tidying this all up and adding stuff at the same time!