Few more scopes. Still very much WIP