A big set of modifications to try implement CG's tiered arena proposal. Going to push to server to debug