major clean up after associations disaster
Merge pull request #1 from vforgione/redo

major clean up after associations disaster
merged in master branch