About half way through adding stop search feature