add most of the classes, tho some are broken