Updated TODO, new code is described in the 'partially' completed section.
Heavily cleaned up code and comments. Now follows PEP-8 for the most part.