Still some refactoring to exercise-stub-structure