Rewrite to one c++ file, update method of finding ids