naming convention for query implementations
Test tidyup
new style create drive statement (factory)
refactor all statements (factory approach)