Fix associations
Fix associations

Some of the assocations were 1:1 instead of 1:many based on the method
used. Also added some two way binding so that helper functions could be
used to get associations.

MustardTigers/MustardTigers