More work towards implementing the Pages API