reworking models based on some advice from a coworker. Need to reinvestigate how I run my json<->model testing, as runtime stuff is broken and getting overly complicated.