Refactored out the Data Manager and cleaned up a bunch of stuff