Started Making Changes to Enable 3D

Incomplete at the time being