Super clean merge

Sorry it sucked before


better workflow!

Whiptail!