For EMF
OH GOD IT'S ALL BROKEN
Merge branch 'emf-talk'