added some files/classes?
swapped from python to c++, added a makefile