Fanclub refactor two