a little dashboard work
merge