In-progress updates to signal handling