christmas commit! more incomplete movement code