Reorganized some of the db handler code.  Also, add some images.