Completely changed the migrations and the models

Second set of migrations and models. Good luck merging! muahahahahaha