Merge pull request #4 from nmcglohon/Neil240

Neil240
More changes to scheduler
Scheduler and Comparators!
Merge pull request #6 from nmcglohon/Neil140

Neil140