Code from PR #26 needs to be vetted and injected into the main branch
Code from PR #26 needs to be vetted and injected into the main branch