Two new dashboards and a bunch of cleanup of the model.