Fixed class derp stuff