First version, tests are failing.
TODO remove JDBC related code