Client base (8/21)

Client base