Added Classes
Added variables
Merge origin/master