Updates Core Data Architecture

Fixes #376

@astralbodies may i bother you with a quick review?

Thank you!