Added some new method on the model and started to do the control. issue #1