All shapes now inherit Shape class, not Mesh