Stops now include basic dynamic generation