See if this fixes PART of #514. Full fix will need storing itemstacks, not blocks