Forgot the toggle button and the client proxy stuff