committing jacki-feature for review

Please review