Initial rev of v7/admin version