Codebase Rebuild Part 3