Added this stuff back in.  I think it's done...