Rework movement to allow for collision checking later.