+wand
+new/more organized item and block classes