Server + Client updates

Changed client to be a class instead of a main