Cleanup
Working dummy without permissions
Perms mapped correctly, but a bit hacky.