Proposal changes as of 11-19, 4:00 pm

Seems essentially complete. Any feedback?