Partial commit of second draft.
Merge remote-tracking branch 'shreymehrotra/master'