1.7 - Refactored

Refactored with PyCharm.  Could still stand a bit more renaming.