Switched to select
Merge branch 'featurize'
Merge branch 'master' into test