Moved save wand logic server-side; refactoring; also fix #5