Client feedback

...in progress!