moving some client stuff around