Got server and client working. Need clean-up