Reorganizing the files and getting it to work with teh has_many side