Moving client stuff out of this repo