Great job – it sounds good! If the routines are very different (which I can certainly see this year, with how the field is laid out) then it probably is best to have completely different functions for each autonomous routine, just like you have done.