second commit fighters now completely use objects