More work on scheduler

got to change some things to play nicely with VC
update