Took out Factory.java