Added client message handling code.

Also, cammel case