Part way through adding repeated start support