More rstack work