Added a bunch of logic to models, data mockers, etc.