Added DrawingFunctions, edited Schedule