got a dashboard working
merge