Initial refactor certs