Yet another large, messy commit.

Remove TODO file (keeping track of it in Evernote)
Last messy commit before cleaning up the current code and separating things into
modules.