Initial rewrite of item/inventory