Start to build in understanding of superuser
Modernise hashes and scopes
Modernize tests