more AP_RALLY, all working now, well tested