#109 - Technical Debt