Converted to c++ file and did some more translation work