Added preliminary scoping stuff