@ryancarlson I've refactored `ModelHelper` into something I think more palatable to both our tastes.