Tech Debt: start new project refactor