There was a PR open for a while with a monster that could switch places with the player, the “swapper.” Looking at that might be helpful?
Edit: Kevin’s response there is gold, BTW.
