wip user associations
fixes #9
Merge branch 'user-associations'