Finish has_many, add working has_one_through