Slowly adding back code that looks right.