we should probably undo the /* style on all of the C++ stuff, imo