Added a lot of admin stuff