Phase II Ready!
Merge pull request #29 from JakePickle/master

Phase II Ready!