Began working on implementing the new datasource