Started working through the database PR feedback.