These two new interactions ended up a fair bit fiddlier to implement than I was hoping for -- no surprise that my first pass at the free movement/grid movement blend has awkward bits, I suppose.
Token count: 4343