Addmin RFR! (this is our previous branch plus the admin and all passing tests :)  )

Can do this with a single conditional (see comment above)