re-did some classes, not as good