Included nn stuff and made sure our domaain matches that described in the paper.
fixed merge