Break up the selection logic to support asynchronous actions
Merge branch 'master' of github.com:eug-/uttt