added some unfinished classes