Mesh and MeshGenerator, prep for #13