Added some untested code to the PageHandler