More work on bug #7950.  I put most of the entry code into the base class.  Now I just have to put the hooks into the specific classes so that it works.