Almost finished removing all the mocked data calls by real database data with the main logic of the system.