Shape & Mesh: Move lots of Mesh functionality to Shape