Add initial work on selecting stops