Getting ready and making changes to implement own query builder.