This doesn't have to be changed, but this is a bit too much nesting of classes for my likes. And having it not static probably isn't right.