Final commit before dashboard chart refactor