Feature/active dsg port

[GoldenZephyr]

@nathanhhughes This is an initial port of the merge tracker and cleanup functor interface changes. This compiles, but no idea yet if it actually runs. I am going to add the rest of the place and frontier changes in another branch on top of this.