Better attempt at should/may ala issue #24