added join table
fixed up associations and added new partials