Added obstacle handling code that cleanly erases them as well