WIP: Dealing with the fallout