Fighting team engine ready for merge with master