Commit some very cool progress, including the correct approach for
autowiring the data source.