Slight changes, thinking of using Xlib instead of XCB.