Started implementing Scope-checking