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

Use 2 (not 4) spaces for indentation.