new dashboard, almost
rest of the stuff on master
rest of the stuff