Cleaning up models

There is so much to do on models.. it is getting there!
I think it would be good if we merge these now.. so I could start
working on controllers too!