Add ann's updated proposal.
Move daniya and marcia
More rejiggering