Preheat oven to 375 degrees. Lightly grease 9 inch baking dish or eight 4 oz mini dishes.

In a large bowl, carefully fold together berries, sugar, and cornstarch. Pour into baking dish(es). 

In a clean bowl, combine flour, baking powder, and ¼ cup sugar. 

Rub in the 5 tablespoons butter using your fingers, or cut in with a pastry blender until it is in small pieces.

Form a well in the center of the mixture and add buttermilk (or milk) and mix. Batter will be thick. 

Spoon batter over berries and sprinkle with cinnamon and sugar.

Bake for 22-25 minutes or until topping is golden brown. Cool for 10 minutes before serving. Serve with a scoop of vanilla ice cream.