Transfering TODO from RsaKeyring to ConfWizard
Handshaker refactoring

(more to come)