RC 2, move New Node code to allow in Collect Mode

Will I ever stop fiddling with this code.