Interim edits to get new node type working