Code proven "working", going through testing
Start of listener splitting
Update changelog