Revert "Revert "Finished the item framework overhaul""

This reverts commit 2e40a68e7dfddb97ebd2abf429f70a87a4bf56e3.