Arc class, and device class for identification
Grid class no longer identifies device; needs testing
Cleanup
Test files