Initial Scopes Feature
Merge branch 'Scopes-Feature'