In the process of a major rewrite for scope types. Code currently does not compile, just committing for update.