Added some listeners, as well as the main command