Added class to ignore.
Moved stuff from static to factory.  Made the factory too.