Re-added image viewer class, testing issues, mods in the NE make it work
just fine.