More rearranging some averaging things...in preparation for moving averaging to before any barrierHit test. Proportional averaging is not a barrierHit test, so these barriers are automatically triggered