WIP. Additional code cleanup. Added dpageuser prototype code to support user defined pages.