Snooper revamp

I'll document in the morning.