merging in new code, especially using the sonar sensor