Add ICP-NL feature. Many bugs to fix.