Ethan S made update to client and server      made fewer serv calls and removed some unecesary stuff