3.6/dev intrepid svoigt

This is the basics of the new data model/webservices
This i'm not sure about. I know some people like two lines between imports and stuff, but I think we've been doing just one so far