Working on fixing scopes.
3 files changed