Commit before merge
Completed chat server interface with sockets - not tested