Expanding codebase for problem