Rework models *again*
Removed migrations because it's getting in the way right now

Also, bluh bluh huge migrate
Sync mdoels with etherpad ideas