Added some (empty) pages, a bit of work on the mapping