Mostly-complete copy and paste.

9 files changed