jebeck/new join wizards and boluses

Pretty much ready to merge this into master @kentquirk, although I'd like a chance to confirm it's operational myself when you've got good data again that I can test it on.
Sure, will do, thanks. (This was added very hastily to help Kent see things he wasn't seeing.)