More work on NorthWind demo.