Injected khan

PR for first child into master.