Added class and CMakeLists.txt