Have getNodeInfoFromInput return a class object
Merging in un-obvious remote changes