Looks like we need to do some work to un-DBTNG the database calls. It's going to be important to make sure the queries are equivalent.