-
Capsule wrapping overhaul round 1 (untested)