Associations

Fixes Issue #3 
Fixes Issue #5