Worked out Factory and added page Regexes

Factory class only created new instances, it didn't put it in a
collection, neither did it allow do get a existing instance from a
collection.