emf compare 2 fork: first pass
9 files changed