More work in progress on the single-image mapper.