moved a bunch of store processing to the manager