Codebase rebuild 2