merged in from master stash after realizing that yeah I was mostly working on state stuff
I'm trying to get movement events working