add basic classes, some functionality