added some classes
resolved merge conflicts