[fix] Added listener check
[minor] Move around requires
[minor] Cleaning up debug statements
[wip] Internal refactor for new post flow