Comments and TODOs
Merge pull request #12 from combatdave/interface

Comments and TODOs