working on updating types to C++