Made the models more generic--changed to setter methods.
Changed the controllers accordingly