Converting from C to C++

Routine commit to save progress.