Finishing Touches on Certificate Manager