Add sub-node cross counting + tests