Progress, must rewrite selection logic