fixing models and relationships. Eric is now a collab