Made it work, since this is C++ and it never works when you come back to it