WIP more progress. Adding pages.