Continuing work on the cpp files.