First pass attempt at [#33].  Code is untested - currently checking in
to test on server.