Some progress to the ItemStack system