Dojo refactoring in the works.