First cut of consumption of WMS and WFS data.

Includes all changes upto: 12e565f