Reworked arena creation. Again.