re-implementing mastery select
mastery select impl
Merge remote-tracking branch 'origin/master'