Started Fixing ClientController