Fixed Movement... Kind of

There was an issue with the Switch. Fixed it.
A* still not working, though, I'll get to that.