Now collects text input (outputs to toast)
Merge remote-tracking branch 'origin/master'