Adds who & whoami, w pending