Consolidate NOE tools, but very rough state now