more refactoring of gps and predictive timer integration