Updated the models to reflect relationships

Hopefully I didn't screw it up...