Feature/club 881WIP DON'T MERGE!

WIP DON'T MERGE THIS!!