Changed to make it less client (vs server) oriented
Changed to make it less client (vs server) oriented
Made less client oriented