Moved process management around some -- still needs work