Added some more stuff to action listeners. Not yet working though.