Ummm...Finally submitting bunch o' changes.

Links, contents, merging, deletion, etc. See individual assignments for
more info.