reworked some associations
working on some associations