Started changing things on the client to allow for the server