Continued work on the bundle, shelved for now.