Second Server Commit

Update of servers part #2