Urgh, version control fail, everything back to where it was