Made model relations, not broken yet