Cylinder done except wireframe
Merge conflicts fixed