Refactored, PageBuilder in progress