AdFixing up some defs, but leaving for @chrisrodz for finishing.