Fixing more database setup stuff.  Redoing the insertion statements.  Preparing for the inner join statements.