WIP correct Addnode and Splitnode impl