Couple Confinement

Going through these twice as fast now.