Added John's line comments as TODO statements.

Line comments tend to get lost as code changes. These will stay in place and move along with the code. Some IDE's (pycharm, kate) also pick these up and allow summaries as a todo list.