Added Server Functionality and Automarch