Codebase Rebuild Part 3.1