Add obstacle and goal setting