New code. First draft.