finish basic model + associations