Some signaling stuff added, about to pivot on auth