Feature/jrh models

Please see commit messages for detail. Comments welcome.