Working in 2 and 3D

Working in 2 and 3D