Preliminary version.
Fixed to use standard mark-up around widget content.  Also fixed bug where local variable was overriding an argument.