Add support for multiple high dim nodes

Tim needs to take a look at the the last merge commit.