Worked some classes around to simplify