tidy
add movement that copes with no-go areas