Restructure of NNST Entry

Continue to pass things to the cc file to be more readable.