Moved some components around and added OnDeathCallbacks.