NF/RF: Major refactor of WICA code.
NF/RF: Major refactor of WICA code.