43/74

Added type-check to new traversal