register up-2-date
finished models and testing
dafuqMerge branch 'master' into courey