started listeners, improved organization