added ClientDatabase; resume feature appears to work