Lots of stuff
Merge pull request #4 from milkypie/Worked

Lots of stuff