Making the admin menu work.  Still buggy.
Merged.