Split commands each into their own class, started work on the Listener