Some more minor tweaks in design
Merge https://github.com/LukeShu/leaguer
Merge https://github.com/LukeShu/leaguer
Merge https://github.com/LukeShu/leaguer
Merge https://github.com/LukeShu/leaguer
Changes the last TODO in 3.2