Bring 4 cups of water to a boil with salt in a large pot. Add in pasta and cook according to instructions or to your desired texture.
As pasta is cooking, prepare all the pasta mix ins. Slice tomatoes, chop basil, pit olives, and slice fresh mozzarella cheese.
Drain pasta and add back to a large pot. Set heat to low. Add in olive oil or butter (or both) to the pasta and mix well.
Add in diced tomatoes, fresh chopped tomatoes, and kalamata olives. Mix well in the pasta and let it heat for 2 minutes.
Lastly, add mozzarella cheese and chopped basil (save some for topping) and mix again. Let it heat so the cheese melts slightly. Season to taste with salt and pepper.
Serve with hot with some fresh chopped basil on top.