Lots of stuff woahhhhh

15 commits of pure unbridled awesomeness