Revert "Lets try shifting data models"

This reverts commit 88250c9939ad5ef2e33f3962d3f0ec9a3966f5bb.
Changed data model. Fuck this
Migrated data model