Added Arena, and fixed some Math. More fixes are needed. But this will
do for tonight.