3.6/dev intrepid svoigt

This is the basics of the new data model/webservices
I think it's cleaner to remove the double newlines here, as well as the unnecessary newline before the close-bracket below this