Finish majority of the proposal

Just have to address a few more questions.