Finish moving code to helpers
Error on belongs_to