Finished with other proposal changes. Merging Andrews changes
Finished with other proposal changes. Merging Andrews changes
Final Proposal