Pulling out coupled code, fixing spec, adding text.