Haven't we started moving these queries to within the model in Hacknight?