Fixing models to work with associations, some dont work currently