JCP edits up to sec 3
Merge github.com:david-deboer/msip-2014