starting to refactor and clean up data manager classes