adds Client and Server - Stage: 1