In a large saucepan combine water, chicken broth, marjoram or basil, and pepper. Bring to boiling. Add the mashed and whole navy beans, pasta, ham or smoked turkey, onion, and celery to the broth mixture. Return to boiling; reduce heat. Simmer, uncovered, for 10 to 15 minutes or until pasta is tender but slightly firm, stirring occasionally. Makes 4 main-dish servings.