For issue #21, finished testing. Made fixes to file IO and usage of C++ classes