Fixed classes partially, still more to fix