More work on the mesh stuff