Filled out a bunch of parser logic.  It handles term identification now.