Started refactoring metrics dashboard queries
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp