Editing semdestroy.
Manual merge stuff.
More manual merge.
I hate merges.