Feature/club 966 2

Mommy, I saw the light