Squashed earthquake-def

Robert's Earthquake branch.