Fleshed out server and server thread classes more