Feature/club 558

DO NOT MERGE - THIS IS ACTUALLY BOOK-558