Code cleanup.  WIP on class based interface to graphpage.
WIP