More judging progress and some nice type safety.