Added the Mystery Class and the assocaited methods to other classes
Merge origin/master