Lots of cleanup.  Still want to separate out the context issues.