did some base work on the client