Working on testing the client a little more