Mostly done.
Local/email version merge