Improved demo, refactored server code to be more upgrade freyndly