Revert "Things Moveable Final"

This reverts commit 723a35a0581ff2b67d62d5a728a0fe4e061d9080.