At last finished phase I.  Moved all of the DB logic out of the Service Layer!