2 pounds shoulder lamb 2 ounces butter 1 ounce plain flour 1 teaspoon marjoram 1 can tomatoes - (8 oz) 1 large onion 2 tablespoons oil 1/4 pint beef stock Salt Freshly-ground black pepper