Beefed up entity class.  Moved things around so that I can look at
occurances of entities rather than strings.