Object avoidance working with limited functionality.
More cleaning and tidying