Major optimization for unique runs

Next to do is script runs!