Mark deliverable code for baselines. Remove dead commented-out code.
Merge pull request #5 from noah-de/development

Sprint 3 deliverable