Aaron's edits after Rick's major upgrade.  Version 1 to push