First pass at stand-along certification addition.