I believe I made the correct changes to get everything listening how I'd want.