Fixing up relations, need to get HasMany working still