continuing the refactor. hugely refined the whole listening system, much cleaner now