Removed commented out code
started works on wands