start work on arena
merge