Internal killer feature

@tkbremnes Merge?