Add Obstacle wrapper
Add removal of agent (broken)