First attempts at a Papa / Nagle merge