Wand tm cleanup2

WIP