Checkpoint some database code and a testf attempt.