Still trying to clean up this association mess, need tests.