This is kind of messy.  Now using context as fields.