moving some client things...