Adding some scheduling stuff
Adding some more magic