(CSCS2650) Began converting logic library to C++ classes