Added some scheduler stuff, finish tomorrow