cont'd

slowly adding back the idioms, in this clearer format