More work on multi-process. This broke stuff.