add more associations and stuff