Updated Proposal to reflect changes, mostly for posterity's sake