Crude merge of code from the running Flutterby.com code, with M-x indent-region reformatting
Some attempts to build tests