Move client out to nipple. Closes #1234