Second commit, added more code, and a join Listener.