Added server
Merged Client and Server together