separated client and server. temporarily commented out code