began rewriting Factory.  Should be able t condense about 200 lines of code into 50, and make it much cleaner