Yeah, I definitely see where you're coming from. If I were to revise it the first thing I would do is completely rework the movement code.