More wip on pki components, plus new drawing