Tech Debt: CMON brandon