Add rematches, nicknames, slight refactor