all tests passing, class variables working