More work on DB stuff.