Begin move to seperate data manager / Cleanup