More work on new db