1.7.10 dev

Fixed some quick problems so that the datasource is somewhat functional.