Added some admin/user functionality