Add ICE editor (not totally functional)
Merge