Broken the stop listing process up and made it strict.

Strict, I say!