Added a whole heap of stuff that should actually be comitted