Added all sorts of scheduling stuff