Develop

Ignore the first commit, all of that stuff is now gone. I should have reverted it to make things clearer, oh well.