3.6/dev intrepid svoigt

This is the basics of the new data model/webservices
unnecessary whitespace