Working on forms
updating associations
FIXING THIS MERGE HELL