All THE CHANGES

Trying to make it C++
Still not done.