First commit of the day, massive changes to pretty much everything, but its all good now