Schedule

Added the schedule, refactored some code.