Working through redoing the examples after the refactoring