test yesno
yesno stuff
Cleaned up the merge

Removed sleep because max's internet is bad enough, and the main thread should
be FAST.  If you want the delay back in there, spin up a new thread first

Remove begin, you don't need that in a define