More development of movement code