Added some stuff to Listeners. and changed driver and controller a little