Starting to fix C++
3 files changed