Start on adding 3D functionality