Breaking up with the bundle

Technical Debt