Stopped using add_to_class

All tests pass.