Feature/jrh models