Here's the beginning of the Client class i've started coding during the weekend
merging stuff