Update to new inventory system; Update to recent Machines changes