Merged codebase with companion code