Started on a way to test
Starting to decouple god class
Moar testing and refractoring
More Changes
Finish deconstructing god class
Merge branch 'Testing'