Oct 8 Commit, closes #9 on Sprint.ly