more WIP conversion to node