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

Will do this in separate branch