Add extra barrier and more custom sched hooks
Reorganize for new format, etc.