merging in the whole GUI thing