First pass at #195

Dumped via console.  See issue #621