2.x conversion, datasource and models updated based on API.  Need more tests.