Updated Proposal to include a pointer back to its context. Updated uses

of proposal to provide that.