Refactor Web Server, needs to change return type if need be