added model functions and cleaning up better
Merge branch 'master' of github.com:floodric/mobilelab3