Edits for Justin's post.

Should be merged into Justin's branch instead of master.