Feature/club 1000 WIP DON'T MERGE