Changes to reflect excellent new architecture diagram.