Phase III Ready
Merge pull request #39 from JakePickle/master

Looks good! Almost done!