Champ select mostly done now