Leek and Potato Soup

I made my first leek and potato soup last week-end. I normally make plain potato soup, what my dad used to call poor man's soup because about the only thing you put in it is potatoes and onion, oh and butter mmmm...., lots and lots of butter. But I digress.
I couldn't find a recipe I liked so after searching a couple days I made the following improvised soup and wrote down exactly what I put in; give it a try.
4 med leeks
3 tbsp butter
1 med 2 sm onion
2 med garlic
3 cup chopped potato
pinch salt +
Cracked pepper
6 cups water
4 bouillion cubes
1 1/2 cup goats milk
6 springs fresh thyme
chives.
cracked pepper
white pepper