Finally a working version.  With all the crap removed.