Further work complete on the admin message directive.