Added environment elements. Intersections not yet complete