Feature/club 1029

This is still useful before going live I reckon