rstack rework WIP