Make better use of promises in RymdNode