Started refactor so one page = one servlet.