More wand changes. Also I accidentally deleted everything in the last commit. Woops.
More wand GUI work, added button selection. Also I accidentally deleted everything on the last commit. Woops.