Added a better schedule generator, still needs some loving.