Major update to the node api (WIP)