Tech Debt: Closes #2 KnuckleDuster