Commiting working version
Committing working version up until meshes