Re-organize into a formal NodeInfo object.
Merge pull request #50 from Obvious/nick-when-6

Re-organize into a formal NodeInfo object.