Committing for now to work on prior issue #58