Please make this an outer class per our new convention ;-)