WIP reworking of admin authorization