EPD-302: Major re-write to use MSI-NM instead of MSI