trying to handle the db end of these changes