Pulled out macros.  Refactored judgements.  Added words.