Added more to the client...
Merged