Adding Clubs and refactoring the coding a bit.