Some EMD Updating

I'll finish the rest tommorow.