Restructuring receiver app flow a bit.