Today's changes. Have not solved the segfault yet. (or the clicking)