Started porting to GTK3