Nodepoolize

Some modifications - to prepare the script for pushing it to the upstream nodepool