Added a lot of admin/normal functionality
Added a lot of admin/normal functionality