Initial refactor of mesh/objects