CNS addin

This is the first commit done by CNS.