Move this up above the resetting parts

So we don't reset the initial move time.