Part of this is that I want to have the utilities in place for @Zsailer to start to write tests for the multidir stuff - which mostly takes place at the level of the dashboard.