Main Service Complete

Reflecting recent changes in DB with email as client primary key