(CSCS2650) More work on converting logic lib to C++