ADD: Cleaned up Scheduler and began incorporating station stops into the scheduling