committing progress on issue #49 and #58.