Class needs tested
Class needs tested