Reduced the advantage of Dapper... but not quite done yet