About 1/2 way through the layout upgrade.