Trying to pull userfactor / uservar stuff from cosign-userfactor branch