Merging with old structure almost done, requires rewriting