Work in progress on the factor storage.