ADD A BUNCH OF STUFF!
Merge pull request #1 from matthewarkin/master

ADD A BUNCH OF STUFF!