plenty of changes to better integrate core data through out the app