Some additions to scheduler.models, still largely incomplete