More movement code work