still working on dashboard
fixed merge conflicts
finally got dashboard working