Had to re-import project.  Pulled latest from github
Cleaned up a few comments, added remaining portions Jared has worked on.