More work on the new presentation system.