Added ActionListener, Graphics etc.