Attempting to fix things.  Looking good so far...