Porting Notes_Logic to C++ is complete