Model Implemented

Can simplify code to only have a getter and setter in model.