Moves to dict + hash, instead of list for scheduling.