WIP on the surface vertex mapping