Renamed some stuff in Pair, extracted Story