Ftr new analytics graphs

WIP ONLY DO NOT MERGE

this will be an ongoing code review for analytics updates for Josh's graphs work