#18 Refactoring per the new page events system