Completed coredata
merge core data with ui changes