Add Hero struct; make inventory more robust