reordering, horrible menuselect tweaks, start of provisioning secrets