Re-orged along lines described in blog post #1