reworked some associations
working on some associations
Merge pull request #34 from rwarbelow/clean_up

Clean up