close to fixing #13
I want to do a couple unit tests, which means I need to abstract out the engine creation in the database.  I was planning to do this anyways.

Signed-off-by: gburgett <gordon.burgett@gmail.com>