More work on moving to a SQLite db.