Merged

However I can't get the server to work on localhost