Preliminary database work

Some preliminary database work; not enough time to finish tonight.