started converting DataManager over