Finished Listener, added more help text, added TODO