Continued work on admin controller.