Hardening up the IREmitters - not complete yet