Move this into the model on the next iteration. I'll add a chore to pivotal tracker.