Scoping is now hacked together