More rstack work...