Stick code in place for using newer server runner, not working yet