Final commit. Removed all mention of data manager as it wasnt being used anymore