Feature/club 567d

Do you think we should just remove this?