PageObject - Refactoring in preparation of Change of Circumstanes.
Merge inlcuding Steve's new XML mapping file.