WIP - Adding associations still isn't working as advertised. Hmmn.