3/4 admin functions complete