Class name almost finished

But for an update issue