Finished work on the Listener class