-Refactor start!
-Leave the old inventory reference until now.