BROKEN COMMIT! Add more structure to page model