Do some code refactoring on Jim's scheduler in preparation of the new list