Gros commit avant refactoring