reworked the models - added relations!!