Trying something

I made some changes and think we should have them in the main project. They're all tested I promise. (Michael if you're looking at this I'm using this to explain github that's why all these weird files.)