Dashbord2

Fixes issue #27