Revert "Revert "Inventory beast but project broke.""

This reverts commit 69e6b35e7af4674ec21f6ca162aa8f4eb7893fe6.