Changes to support Dashboard refactor, Part I

Leaving open for a bit.