added new node types, work not completed