I should have probably finished this out: but, I was thinking these SQL queries really should be getting put into `DataSource` rather than "littered" about the files. At the least, this should be a TODO