refactored source for proposed DataManager (WIP)