More work toward IPC, almost there...