A new datasource, some reorganization, and (untested) /f help