Now with a factory for wrappers.