Integrate raw bonds + other changes.