Codebase Rebuild Part 4