Feature/club 42

Still Need to fix tests