major overhaul of core data manager