Some semi-final changes to the inventory

On to bigger better projects!