Arena class, and other notcommited changes!