Initial attempt at solving problems

This is my first try at a solution.  One of the unit tests is FAILING,
but that's because of a bug in the unit tests that expects a regular
expression in a function that should return a string.  Hopefully the CI
test doesn't have the same problem?