Added some signal/slot routing. Something is still wrong though.