Reinstate the default dbh
Refactor the engine