more derp
I hope I didn't fail this c++ merge