Implemented ClientService. Refactored client tests.
Refactored listener registrations.
Merged.