Fixing a bunch of crap I broke.... lol
Data Model and Store files and bridging header,
Revert "Data Model and Store files and bridging header,"

This reverts commit 385f2c4243cd4908b2c9392021a83e9f5a2002ce.
Fixing more stuff.... don't worry didn't mess any of your UI stuff up :)