Bernardo Magri 9d425aee58 major refactor from Jules hai 1 mes
..
lumacs 9d425aee58 major refactor from Jules hai 1 mes