Refactor and get exec + FD inheritance working