Oops had to commit earlier.. Changed lots of things :D