Revert "Remove threat move stuff"

This reverts commit f5727deee3823accf791984836f45db78e3a53e5.