Add TODO comments and form summaries
Merge pull request #22 from egeldenhuys/Comments

Add TODO comments and form summaries