implement methods on models
clean up
Merge remote-tracking branch 'origin/master'