Legacy Code Overhaul by Connor L