added some additional classes (in progress...)