[S02E01][S02E02] First working version of q1 and q2. To refactor !