More incremental work on badge application.