Working on the organising code
Working on the organiser