more changes. only partial, need to shadow sqldatabase connection
now with shadowing
all unit tests passing