Changing the models around a bit

Database not building. More tomorrow.