Some more for do_fork
Finished the first pass