Revert "remove old mastery system causing issues with new one"

This reverts commit 37d096b2019aa2db59852a52f7cd0bb4f68864b4.