'final' version before major changes
More than a refactor -- changed the direction of the presentation: