Second draft.
Merge branch 'proposal'