Start adding scheduling logic