added initial logic for dashboard
fixed merge conflict