working on refactoring/ moving examples