Jm/need comments

**This PR is dependent on #12.  This one should only be reviewed after #12 is merged in**