Updated to run on the server. Current commit represents what's on the server.