Added Server Class and source