Permissions work

Prep work for first public beta