Reworking permissions

More permissions changes, slight changes to save flow.