wip commit
partial refactoring for exercises & trainings (& specs). WIP commit