Almost have per run selection working