Being  a bit dirty with this commit as I also did some refactoring in spite of implementing model methods.
Again a bit of refactoring and then again I implemented another Model method.
Mostly refactoring.