dashboard stuff

delivery and ccm
dashboard stuff

ccm
Merge pull request #13 from watshisface/master

dashboard stuff