Groundwork for EF To Dapper Migration
Most functionality is now working again against Dapper