Most code merged, but not switched to new data

Still scrolls OK