Meshing

Merging the meshing work