Finished refactor.  Logging, PEP8 Mostly..., Tests broken.