commit for ge
clean up
merging
minor refactor to add multi language support and idempotence