Revert "adminserv and stuff"

This reverts commit e985a155e082518058cbde66331d52c264aab54b.
Revert "Revert "adminserv and stuff""

This reverts commit 325aa003baf3db6115c214856c0eccda3ce6fdbb.