[WIP] lots of crap
lots of things
Merge pull request #36 from jamoque/but-actually-about-to-submit

But actually about to submit