renamed classes to 2D in anticipation of adding in 3D classes