Initial changes including server
More changes
More changes