finished models and testing
dafuqMerge branch 'master' into courey