Added some more admin stuff - still need to lock it down