I used this as a base and made some changes. I used beef broth instead of water, crushed tomatoes instead of tomato sauce and omitted the olive oil. Seasonings ended up being 2t of Cilantro, 2t of Basil and 2t of Thyme. The dish tasted fabulous - especially the yogurt/egg top!!
Warning - I had to up the temp of the oven (from 325 to 375) and cook on speed bake an additional 20 minutes (after the initial 40 minutes) to get the potatoes to cook through.
Knowing this, I'll definitely make this again, but will double the egg/yogurt topping mix.