Replace everything

This module was old and getting older.  This simply replaces everything
here with what we had been using internally.