some reorganizing bc nested_attributes are making me nuts