NF add modularity calc, need tests