new classes

not finished yet