Boil the potatoes until they are tender - about 20 minutes. Don't let them get mushy!
Combine all other ingredients (except avocado) in a bowl. Add drained potatoes and gently toss. Adjust salt and pepper. Set in the fridge for awhile to cool down. This can be served warm if you can't wait!
Served topped with sliced or chopped avocado (be sure to add a little salt to the avocado too).