Restructure the listener - better flow and less stupid messages