Experimented with formalizing the MOVED idea more

- Not much really, mostly a refactor and trying to formalize the idea some.