Refactor 2 x hasMany to belongsToMany

Still WIP