Refactored out some more IPC's