Changed commands a bit and added moved CommandListener in with the other
listeners