Revert "Revert "Somehow messed up grid movement...""

This reverts commit 67157d551c38c44b57b9e24257b52d5e30303122.