I am about to do a mojor change to the way data sources are selected.
Cleaning up the repository.