added some classes from other project. Have not integrated them yet