Initial work on getting scheduling right