Reworked move/jump logic, simplified and cleaned up.