Continued refactoring into dashboard PORO.