Surprise! Accommodating the Non-ADD Spouse