Some more work on setting up codebase integration