Started rewriting models to be more NBP-esque