Doing some major class changes