Added setupMatch
merged Arena class
merged Arena class