Safety Commit (Class Size Still Broken)