Add ClassChoose

And some other things