Added PageLogic and Tests